2005-08-31 Matthias Clasen <mclasen@redhat.com>
- * gdk/x11/gdkwindow-x11.c (gdk_window_impl_x11_get_type):
- * gdk/x11/gdkscreen-x11.c (_gdk_screen_x11_get_type):
- * gdk/x11/gdkpixmap-x11.c (gdk_pixmap_impl_x11_get_type):
- * gdk/x11/gdkkeys-x11.c (gdk_keymap_x11_get_type):
- * gdk/x11/gdkinput.c (gdk_device_get_type):
- * gdk/x11/gdkimage-x11.c (gdk_image_get_type):
- * gdk/x11/gdkgc-x11.c (_gdk_gc_x11_get_type):
- * gdk/x11/gdkdrawable-x11.c (_gdk_drawable_impl_x11_get_type):
- * gdk/x11/gdkdnd-x11.c (gdk_drag_context_get_type):
- * gdk/x11/gdkdisplay-x11.c (_gdk_display_x11_get_type):
- * gdk/x11/gdkcolor-x11.c (gdk_colormap_get_type):
- * gdk/gdkwindow.c (gdk_window_object_get_type):
- * gdk/gdkscreen.c (gdk_screen_get_type):
- * gdk/gdkrectangle.c (gdk_rectangle_get_type):
- * gdk/gdkpixmap.c (gdk_pixmap_get_type):
- * gdk/gdkkeys.c (gdk_keymap_get_type):
- * gdk/gdkfont.c (gdk_font_get_type):
- * gdk/gdkevents.c (gdk_event_get_type):
- * gdk/gdkdraw.c (gdk_drawable_get_type):
- * gdk/gdkdisplaymanager.c (gdk_display_manager_get_type):
- * gdk/gdkdisplay.c (gdk_display_get_type):
- * gdk/gdkcursor.c (gdk_cursor_get_type):
- * gdk/gdkcolor.c (gdk_color_get_type): Intern type names before
- registering the type to avoid unnecessary copies.
+ * gdk/Makefile.am:
+ * gtk/Makefile.am: Intern type names in code generated by
+ glib-mkenums, too.
+
+ * gtk/*.c:
+ * gdk/x11/*.c:
+ * gdk/*.c: Intern type names before registering the type to avoid
+ unnecessary copies.
* configure.in: Require GLib 2.9.0
2005-08-31 Matthias Clasen <mclasen@redhat.com>
- * gdk/x11/gdkwindow-x11.c (gdk_window_impl_x11_get_type):
- * gdk/x11/gdkscreen-x11.c (_gdk_screen_x11_get_type):
- * gdk/x11/gdkpixmap-x11.c (gdk_pixmap_impl_x11_get_type):
- * gdk/x11/gdkkeys-x11.c (gdk_keymap_x11_get_type):
- * gdk/x11/gdkinput.c (gdk_device_get_type):
- * gdk/x11/gdkimage-x11.c (gdk_image_get_type):
- * gdk/x11/gdkgc-x11.c (_gdk_gc_x11_get_type):
- * gdk/x11/gdkdrawable-x11.c (_gdk_drawable_impl_x11_get_type):
- * gdk/x11/gdkdnd-x11.c (gdk_drag_context_get_type):
- * gdk/x11/gdkdisplay-x11.c (_gdk_display_x11_get_type):
- * gdk/x11/gdkcolor-x11.c (gdk_colormap_get_type):
- * gdk/gdkwindow.c (gdk_window_object_get_type):
- * gdk/gdkscreen.c (gdk_screen_get_type):
- * gdk/gdkrectangle.c (gdk_rectangle_get_type):
- * gdk/gdkpixmap.c (gdk_pixmap_get_type):
- * gdk/gdkkeys.c (gdk_keymap_get_type):
- * gdk/gdkfont.c (gdk_font_get_type):
- * gdk/gdkevents.c (gdk_event_get_type):
- * gdk/gdkdraw.c (gdk_drawable_get_type):
- * gdk/gdkdisplaymanager.c (gdk_display_manager_get_type):
- * gdk/gdkdisplay.c (gdk_display_get_type):
- * gdk/gdkcursor.c (gdk_cursor_get_type):
- * gdk/gdkcolor.c (gdk_color_get_type): Intern type names before
- registering the type to avoid unnecessary copies.
+ * gdk/Makefile.am:
+ * gtk/Makefile.am: Intern type names in code generated by
+ glib-mkenums, too.
+
+ * gtk/*.c:
+ * gdk/x11/*.c:
+ * gdk/*.c: Intern type names before registering the type to avoid
+ unnecessary copies.
* configure.in: Require GLib 2.9.0
2005-08-31 Matthias Clasen <mclasen@redhat.com>
+ * Makefile.am (gdk-pixbuf-enum-types.c): Intern type
+ names in code generated by glib-mkenums, too.
+
* io-ani-animation.c (gdk_pixbuf_ani_anim_iter_get_type)
(gdk_pixbuf_ani_anim_get_type):
* io-gif-animation.c (gdk_pixbuf_gif_anim_get_type)
--ftail "\n#define __GDK_PIXBUF_ENUM_TYPES_C__\n#include \"gdk-pixbuf-aliasdef.c\"" \
--vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
- --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \
+ --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (g_intern_static_string (\"@EnumName@\"), values);\n }\n return etype;\n}\n" \
$(gdk_pixbuf_headers)) > gdk-pixbuf-enum-types.c
#
--ftail "\n#define __GDK_ENUM_TYPES_C__\n#include \"gdkaliasdef.c\"\n" \
--vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
- --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \
+ --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (g_intern_static_string (\"@EnumName@\"), values);\n }\n return etype;\n}\n" \
$(gdk_public_h_sources) ) > xgen-getc \
&& cp xgen-getc gdkenumtypes.c \
&& rm -f xgen-getc
--fprod "\n/* enumerations from \"@filename@\" */" \
--vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
- --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \
+ --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (g_intern_static_string (\"@EnumName@\"), values);\n }\n return etype;\n}\n" \
$(gtk_public_h_sources) ) > xgen-gtbc \
&& cp xgen-gtbc gtktypebuiltins.c \
&& rm -f xgen-gtbc
(GInstanceInitFunc) gtk_accel_group_init,
};
- object_type = g_type_register_static (G_TYPE_OBJECT, "GtkAccelGroup",
+ object_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkAccelGroup"),
&object_info, 0);
}
};
accel_label_type =
- g_type_register_static (GTK_TYPE_LABEL, "GtkAccelLabel",
+ g_type_register_static (GTK_TYPE_LABEL, g_intern_static_string ("GtkAccelLabel"),
&accel_label_info, 0);
}
};
accessible_type =
- g_type_register_static (ATK_TYPE_OBJECT, "GtkAccessible",
+ g_type_register_static (ATK_TYPE_OBJECT, g_intern_static_string ("GtkAccessible"),
&accessible_info, 0);
}
};
type = g_type_register_static (G_TYPE_OBJECT,
- "GtkAction",
+ g_intern_static_string ("GtkAction"),
&type_info, 0);
}
return type;
(GInstanceInitFunc) gtk_action_group_init,
};
- type = g_type_register_static (G_TYPE_OBJECT, "GtkActionGroup",
+ type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkActionGroup"),
&type_info, 0);
}
};
adjustment_type =
- g_type_register_static (GTK_TYPE_OBJECT, "GtkAdjustment",
+ g_type_register_static (GTK_TYPE_OBJECT, g_intern_static_string ("GtkAdjustment"),
&adjustment_info, 0);
}
(GInstanceInitFunc) gtk_alignment_init,
};
- alignment_type = g_type_register_static (GTK_TYPE_BIN, "GtkAlignment",
+ alignment_type = g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkAlignment"),
&alignment_info, 0);
}
(GInstanceInitFunc) gtk_arrow_init,
};
- arrow_type = g_type_register_static (GTK_TYPE_MISC, "GtkArrow",
+ arrow_type = g_type_register_static (GTK_TYPE_MISC, g_intern_static_string ("GtkArrow"),
&arrow_info, 0);
}
};
aspect_frame_type =
- g_type_register_static (GTK_TYPE_FRAME, "GtkAspectFrame",
+ g_type_register_static (GTK_TYPE_FRAME, g_intern_static_string ("GtkAspectFrame"),
&aspect_frame_info, 0);
}
};
button_box_type =
- g_type_register_static (GTK_TYPE_BOX, "GtkButtonBox",
+ g_type_register_static (GTK_TYPE_BOX, g_intern_static_string ("GtkButtonBox"),
&button_box_info, G_TYPE_FLAG_ABSTRACT);
}
NULL, /* value_table */
};
- bin_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkBin",
+ bin_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkBin"),
&bin_info, G_TYPE_FLAG_ABSTRACT);
}
NULL, /* value_table */
};
- box_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkBox",
+ box_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkBox"),
&box_info, G_TYPE_FLAG_ABSTRACT);
}
(GInstanceInitFunc) gtk_button_init,
};
- button_type = g_type_register_static (GTK_TYPE_BIN, "GtkButton",
+ button_type = g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkButton"),
&button_info, 0);
}
};
cell_editable_type =
- g_type_register_static (G_TYPE_INTERFACE, "GtkCellEditable",
+ g_type_register_static (G_TYPE_INTERFACE, g_intern_static_string ("GtkCellEditable"),
&cell_editable_info, 0);
g_type_interface_add_prerequisite (cell_editable_type, GTK_TYPE_WIDGET);
};
cell_layout_type =
- g_type_register_static (G_TYPE_INTERFACE, "GtkCellLayout",
+ g_type_register_static (G_TYPE_INTERFACE, g_intern_static_string ("GtkCellLayout"),
&cell_layout_info, 0);
g_type_interface_add_prerequisite (cell_layout_type, G_TYPE_OBJECT);
NULL, /* value_table */
};
- cell_type = g_type_register_static (GTK_TYPE_OBJECT, "GtkCellRenderer",
+ cell_type = g_type_register_static (GTK_TYPE_OBJECT, g_intern_static_string ("GtkCellRenderer"),
&cell_info, G_TYPE_FLAG_ABSTRACT);
}
};
cell_pixbuf_type =
- g_type_register_static (GTK_TYPE_CELL_RENDERER, "GtkCellRendererPixbuf",
+ g_type_register_static (GTK_TYPE_CELL_RENDERER, g_intern_static_string ("GtkCellRendererPixbuf"),
&cell_pixbuf_info, 0);
}
};
cell_text_type =
- g_type_register_static (GTK_TYPE_CELL_RENDERER, "GtkCellRendererText",
+ g_type_register_static (GTK_TYPE_CELL_RENDERER, g_intern_static_string ("GtkCellRendererText"),
&cell_text_info, 0);
}
};
cell_toggle_type =
- g_type_register_static (GTK_TYPE_CELL_RENDERER, "GtkCellRendererToggle",
+ g_type_register_static (GTK_TYPE_CELL_RENDERER, g_intern_static_string ("GtkCellRendererToggle"),
&cell_toggle_info, 0);
}
NULL
};
- cell_view_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkCellView",
+ cell_view_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkCellView"),
&cell_view_info, 0);
g_type_add_interface_static (cell_view_type, GTK_TYPE_CELL_LAYOUT,
};
check_button_type =
- g_type_register_static (GTK_TYPE_TOGGLE_BUTTON, "GtkCheckButton",
+ g_type_register_static (GTK_TYPE_TOGGLE_BUTTON, g_intern_static_string ("GtkCheckButton"),
&check_button_info, 0);
}
};
check_menu_item_type =
- g_type_register_static (GTK_TYPE_MENU_ITEM, "GtkCheckMenuItem",
+ g_type_register_static (GTK_TYPE_MENU_ITEM, g_intern_static_string ("GtkCheckMenuItem"),
&check_menu_item_info, 0);
}
(GInstanceInitFunc) NULL,
};
- clipboard_type = g_type_register_static (G_TYPE_OBJECT, "GtkClipboard",
+ clipboard_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkClipboard"),
&clipboard_info, 0);
}
(GtkClassInitFunc) NULL,
};
+ g_intern_static_string ("GtkCList");
clist_type = gtk_type_unique (GTK_TYPE_CONTAINER, &clist_info);
}
};
color_button_type =
- g_type_register_static (GTK_TYPE_BUTTON, "GtkColorButton",
+ g_type_register_static (GTK_TYPE_BUTTON, g_intern_static_string ("GtkColorButton"),
&color_button_info, 0);
}
};
color_selection_type =
- g_type_register_static (GTK_TYPE_VBOX, "GtkColorSelection",
+ g_type_register_static (GTK_TYPE_VBOX, g_intern_static_string ("GtkColorSelection"),
&color_selection_info, 0);
}
};
color_selection_dialog_type =
- g_type_register_static (GTK_TYPE_DIALOG, "GtkColorSelectionDialog",
+ g_type_register_static (GTK_TYPE_DIALOG, g_intern_static_string ("GtkColorSelectionDialog"),
&colorsel_diag_info, 0);
}
(GInstanceInitFunc) gtk_combo_init,
};
- combo_type = g_type_register_static (GTK_TYPE_HBOX, "GtkCombo",
+ combo_type = g_type_register_static (GTK_TYPE_HBOX, g_intern_static_string ("GtkCombo"),
&combo_info, 0);
}
};
combo_box_type = g_type_register_static (GTK_TYPE_BIN,
- "GtkComboBox",
+ g_intern_static_string ("GtkComboBox"),
&combo_box_info,
0);
};
combo_box_entry_type = g_type_register_static (GTK_TYPE_COMBO_BOX,
- "GtkComboBoxEntry",
+ g_intern_static_string ("GtkComboBoxEntry"),
&combo_box_entry_info,
0);
}
};
container_type =
- g_type_register_static (GTK_TYPE_WIDGET, "GtkContainer",
+ g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkContainer"),
&container_info, G_TYPE_FLAG_ABSTRACT);
}
(GtkClassInitFunc) NULL,
};
+ g_intern_static_string ("GtkCTree");
ctree_type = gtk_type_unique (GTK_TYPE_CLIST, &ctree_info);
}
(GInstanceInitFunc) gtk_curve_init,
};
- curve_type = g_type_register_static (GTK_TYPE_DRAWING_AREA, "GtkCurve",
+ curve_type = g_type_register_static (GTK_TYPE_DRAWING_AREA, g_intern_static_string ("GtkCurve"),
&curve_info, 0);
}
return curve_type;
(GInstanceInitFunc) gtk_dialog_init,
};
- dialog_type = g_type_register_static (GTK_TYPE_WINDOW, "GtkDialog",
+ dialog_type = g_type_register_static (GTK_TYPE_WINDOW, g_intern_static_string ("GtkDialog"),
&dialog_info, 0);
}
};
drawing_area_type =
- g_type_register_static (GTK_TYPE_WIDGET, "GtkDrawingArea",
+ g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkDrawingArea"),
&drawing_area_info, 0);
}
NULL, /* base_finalize */
};
- editable_type = g_type_register_static (G_TYPE_INTERFACE, "GtkEditable",
+ editable_type = g_type_register_static (G_TYPE_INTERFACE, g_intern_static_string ("GtkEditable"),
&editable_info, 0);
}
NULL /* interface_data */
};
- entry_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkEntry",
+ entry_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkEntry"),
&entry_info, 0);
g_type_add_interface_static (entry_type,
};
entry_completion_type =
- g_type_register_static (G_TYPE_OBJECT, "GtkEntryCompletion",
+ g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkEntryCompletion"),
&entry_completion_info, 0);
g_type_add_interface_static (entry_completion_type,
(GInstanceInitFunc) gtk_event_box_init,
};
- event_box_type = g_type_register_static (GTK_TYPE_BIN, "GtkEventBox",
+ event_box_type = g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkEventBox"),
&event_box_info, 0);
}
};
expander_type = g_type_register_static (GTK_TYPE_BIN,
- "GtkExpander",
+ g_intern_static_string ("GtkExpander"),
&expander_info, 0);
}
};
file_chooser_type = g_type_register_static (G_TYPE_INTERFACE,
- "GtkFileChooser",
+ g_intern_static_string ("GtkFileChooser"),
&file_chooser_info, 0);
g_type_interface_add_prerequisite (file_chooser_type, GTK_TYPE_WIDGET);
NULL /* interface_data */
};
- file_chooser_default_type = g_type_register_static (GTK_TYPE_VBOX, "GtkFileChooserDefault",
+ file_chooser_default_type = g_type_register_static (GTK_TYPE_VBOX, g_intern_static_string ("GtkFileChooserDefault"),
&file_chooser_default_info, 0);
g_type_add_interface_static (file_chooser_default_type,
NULL /* interface_data */
};
- file_chooser_dialog_type = g_type_register_static (GTK_TYPE_DIALOG, "GtkFileChooserDialog",
+ file_chooser_dialog_type = g_type_register_static (GTK_TYPE_DIALOG, g_intern_static_string ("GtkFileChooserDialog"),
&file_chooser_dialog_info, 0);
g_type_add_interface_static (file_chooser_dialog_type,
GTK_TYPE_FILE_CHOOSER,
};
file_chooser_embed_type = g_type_register_static (G_TYPE_INTERFACE,
- "GtkFileChooserEmbed",
+ g_intern_static_string ("GtkFileChooserEmbed"),
&file_chooser_embed_info, 0);
g_type_interface_add_prerequisite (file_chooser_embed_type, GTK_TYPE_WIDGET);
};
- file_chooser_entry_type = g_type_register_static (GTK_TYPE_ENTRY, "GtkFileChooserEntry",
+ file_chooser_entry_type = g_type_register_static (GTK_TYPE_ENTRY, g_intern_static_string ("GtkFileChooserEntry"),
&file_chooser_entry_info, 0);
g_type_add_interface_static (file_chooser_entry_type,
GTK_TYPE_EDITABLE,
NULL /* interface_data */
};
- file_chooser_widget_type = g_type_register_static (GTK_TYPE_VBOX, "GtkFileChooserWidget",
+ file_chooser_widget_type = g_type_register_static (GTK_TYPE_VBOX, g_intern_static_string ("GtkFileChooserWidget"),
&file_chooser_widget_info, 0);
g_type_add_interface_static (file_chooser_widget_type,
NULL /* init */
};
- file_filter_type = g_type_register_static (GTK_TYPE_OBJECT, "GtkFileFilter",
+ file_filter_type = g_type_register_static (GTK_TYPE_OBJECT, g_intern_static_string ("GtkFileFilter"),
&file_filter_info, 0);
}
};
file_selection_type =
- g_type_register_static (GTK_TYPE_DIALOG, "GtkFileSelection",
+ g_type_register_static (GTK_TYPE_DIALOG, g_intern_static_string ("GtkFileSelection"),
&filesel_info, 0);
}
static GType our_type = 0;
if (our_type == 0)
- our_type = g_boxed_type_register_static ("GtkFileInfo",
+ our_type = g_boxed_type_register_static (g_intern_static_string ("GtkFileInfo"),
(GBoxedCopyFunc) gtk_file_info_copy,
(GBoxedFreeFunc) gtk_file_info_free);
};
file_system_type = g_type_register_static (G_TYPE_INTERFACE,
- "GtkFileSystem",
+ g_intern_static_string ("GtkFileSystem"),
&file_system_info, 0);
g_type_interface_add_prerequisite (file_system_type, G_TYPE_OBJECT);
};
file_folder_type = g_type_register_static (G_TYPE_INTERFACE,
- "GtkFileFolder",
+ g_intern_static_string ("GtkFileFolder"),
&file_folder_info, 0);
g_type_interface_add_prerequisite (file_folder_type, G_TYPE_OBJECT);
static GType our_type = 0;
if (our_type == 0)
- our_type = g_boxed_type_register_static ("GtkFilePath",
+ our_type = g_boxed_type_register_static (g_intern_static_string ("GtkFilePath"),
(GBoxedCopyFunc) gtk_file_path_real_copy,
(GBoxedFreeFunc) gtk_file_path_real_free);
};
file_system_model_type = g_type_register_static (G_TYPE_OBJECT,
- "GtkFileSystemModel",
+ g_intern_static_string ("GtkFileSystemModel"),
&file_system_model_info, 0);
g_type_add_interface_static (file_system_model_type,
GTK_TYPE_TREE_MODEL,
};
file_system_unix_type = g_type_register_static (G_TYPE_OBJECT,
- "GtkFileSystemUnix",
+ g_intern_static_string ("GtkFileSystemUnix"),
&file_system_unix_info, 0);
g_type_add_interface_static (file_system_unix_type,
GTK_TYPE_FILE_SYSTEM,
};
file_folder_unix_type = g_type_register_static (G_TYPE_OBJECT,
- "GtkFileFolderUnix",
+ g_intern_static_string ("GtkFileFolderUnix"),
&file_folder_unix_info, 0);
g_type_add_interface_static (file_folder_unix_type,
GTK_TYPE_FILE_FOLDER,
};
file_system_win32_type = g_type_register_static (G_TYPE_OBJECT,
- "GtkFileSystemWin32",
+ g_intern_static_string ("GtkFileSystemWin32"),
&file_system_win32_info, 0);
g_type_add_interface_static (file_system_win32_type,
GTK_TYPE_FILE_SYSTEM,
};
file_folder_win32_type = g_type_register_static (G_TYPE_OBJECT,
- "GtkFileFolderWin32",
+ g_intern_static_string ("GtkFileFolderWin32"),
&file_folder_win32_info, 0);
g_type_add_interface_static (file_folder_win32_type,
GTK_TYPE_FILE_FOLDER,
(GInstanceInitFunc) gtk_fixed_init,
};
- fixed_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkFixed",
+ fixed_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkFixed"),
&fixed_info, 0);
}
};
font_button_type =
- g_type_register_static (GTK_TYPE_BUTTON, "GtkFontButton",
+ g_type_register_static (GTK_TYPE_BUTTON, g_intern_static_string ("GtkFontButton"),
&font_button_info, 0);
}
};
font_selection_type =
- g_type_register_static (GTK_TYPE_VBOX, "GtkFontSelection",
+ g_type_register_static (GTK_TYPE_VBOX, g_intern_static_string ("GtkFontSelection"),
&fontsel_type_info, 0);
}
};
font_selection_dialog_type =
- g_type_register_static (GTK_TYPE_DIALOG, "GtkFontSelectionDialog",
+ g_type_register_static (GTK_TYPE_DIALOG, g_intern_static_string ("GtkFontSelectionDialog"),
&fontsel_diag_info, 0);
}
(GInstanceInitFunc) gtk_frame_init,
};
- frame_type = g_type_register_static (GTK_TYPE_BIN, "GtkFrame",
+ frame_type = g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkFrame"),
&frame_info, 0);
}
(GInstanceInitFunc) gtk_gamma_curve_init,
};
- gamma_curve_type = g_type_register_static (GTK_TYPE_VBOX, "GtkGammaCurve",
+ gamma_curve_type = g_type_register_static (GTK_TYPE_VBOX, g_intern_static_string ("GtkGammaCurve"),
&gamma_curve_info, 0);
}
return gamma_curve_type;
(GInstanceInitFunc) gtk_handle_box_init,
};
- handle_box_type = g_type_register_static (GTK_TYPE_BIN, "GtkHandleBox",
+ handle_box_type = g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkHandleBox"),
&handle_box_info, 0);
}
};
hbutton_box_type =
- g_type_register_static (GTK_TYPE_BUTTON_BOX, "GtkHButtonBox",
+ g_type_register_static (GTK_TYPE_BUTTON_BOX, g_intern_static_string ("GtkHButtonBox"),
&hbutton_box_info, 0);
}
(GInstanceInitFunc) gtk_hbox_init,
};
- hbox_type = g_type_register_static (GTK_TYPE_BOX, "GtkHBox",
+ hbox_type = g_type_register_static (GTK_TYPE_BOX, g_intern_static_string ("GtkHBox"),
&hbox_info, 0);
}
(GInstanceInitFunc) gtk_hpaned_init,
};
- hpaned_type = g_type_register_static (GTK_TYPE_PANED, "GtkHPaned",
+ hpaned_type = g_type_register_static (GTK_TYPE_PANED, g_intern_static_string ("GtkHPaned"),
&hpaned_info, 0);
}
(GInstanceInitFunc) gtk_hruler_init,
};
- hruler_type = g_type_register_static (GTK_TYPE_RULER, "GtkHRuler",
+ hruler_type = g_type_register_static (GTK_TYPE_RULER, g_intern_static_string ("GtkHRuler"),
&hruler_info, 0);
}
(GInstanceInitFunc) gtk_hscale_init,
};
- hscale_type = g_type_register_static (GTK_TYPE_SCALE, "GtkHScale",
+ hscale_type = g_type_register_static (GTK_TYPE_SCALE, g_intern_static_string ("GtkHScale"),
&hscale_info, 0);
}
};
hscrollbar_type =
- g_type_register_static (GTK_TYPE_SCROLLBAR, "GtkHScrollbar",
+ g_type_register_static (GTK_TYPE_SCROLLBAR, g_intern_static_string ("GtkHScrollbar"),
&hscrollbar_info, 0);
}
};
hseparator_type =
- g_type_register_static (GTK_TYPE_SEPARATOR, "GtkHSeparator",
+ g_type_register_static (GTK_TYPE_SEPARATOR, g_intern_static_string ("GtkHSeparator"),
&hseparator_info, 0);
}
(GInstanceInitFunc) gtk_hsv_init,
};
- hsv_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkHSV",
+ hsv_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkHSV"),
&hsv_info, 0);
}
static GType our_type = 0;
if (our_type == 0)
- our_type = g_boxed_type_register_static ("GtkIconSet",
+ our_type = g_boxed_type_register_static (g_intern_static_string ("GtkIconSet"),
(GBoxedCopyFunc) gtk_icon_set_ref,
(GBoxedFreeFunc) gtk_icon_set_unref);
(GInstanceInitFunc) gtk_icon_theme_init,
};
- type = g_type_register_static (G_TYPE_OBJECT, "GtkIconTheme", &info, 0);
+ type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkIconTheme"), &info, 0);
}
return type;
static GType our_type = 0;
if (our_type == 0)
- our_type = g_boxed_type_register_static ("GtkIconInfo",
+ our_type = g_boxed_type_register_static (g_intern_static_string ("GtkIconInfo"),
(GBoxedCopyFunc) gtk_icon_info_copy,
(GBoxedFreeFunc) gtk_icon_info_free);
};
type = g_type_register_static (ATK_TYPE_OBJECT,
- "GtkIconViewItemAccessible", &tinfo, 0);
+ g_intern_static_string ("GtkIconViewItemAccessible"), &tinfo, 0);
g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
&atk_component_info);
g_type_add_interface_static (type, ATK_TYPE_ACTION,
(GInstanceInitFunc) gtk_image_init,
};
- image_type = g_type_register_static (GTK_TYPE_MISC, "GtkImage",
+ image_type = g_type_register_static (GTK_TYPE_MISC, g_intern_static_string ("GtkImage"),
&image_info, 0);
}
};
image_menu_item_type =
- g_type_register_static (GTK_TYPE_MENU_ITEM, "GtkImageMenuItem",
+ g_type_register_static (GTK_TYPE_MENU_ITEM, g_intern_static_string ("GtkImageMenuItem"),
&image_menu_item_info, 0);
}
};
im_context_type =
- g_type_register_static (G_TYPE_OBJECT, "GtkIMContext",
+ g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkIMContext"),
&im_context_info, G_TYPE_FLAG_ABSTRACT);
}
};
im_context_simple_type =
- g_type_register_static (GTK_TYPE_IM_CONTEXT, "GtkIMContextSimple",
+ g_type_register_static (GTK_TYPE_IM_CONTEXT, g_intern_static_string ("GtkIMContextSimple"),
&im_context_simple_info, 0);
}
};
im_module_type =
- g_type_register_static (G_TYPE_TYPE_MODULE, "GtkIMModule",
+ g_type_register_static (G_TYPE_TYPE_MODULE, g_intern_static_string ("GtkIMModule"),
&im_module_info, 0);
}
};
im_multicontext_type =
- g_type_register_static (GTK_TYPE_IM_CONTEXT, "GtkIMMulticontext",
+ g_type_register_static (GTK_TYPE_IM_CONTEXT, g_intern_static_string ("GtkIMMulticontext"),
&im_multicontext_info, 0);
}
};
input_dialog_type =
- g_type_register_static (GTK_TYPE_DIALOG, "GtkInputDialog",
+ g_type_register_static (GTK_TYPE_DIALOG, g_intern_static_string ("GtkInputDialog"),
&input_dialog_info, 0);
}
(GInstanceInitFunc) gtk_invisible_init,
};
- invisible_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkInvisible",
+ invisible_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkInvisible"),
&invisible_info, 0);
}
NULL, /* value_table */
};
- item_type = g_type_register_static (GTK_TYPE_BIN, "GtkItem",
+ item_type = g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkItem"),
&item_info, G_TYPE_FLAG_ABSTRACT);
}
};
item_factory_type =
- g_type_register_static (GTK_TYPE_OBJECT, "GtkItemFactory",
+ g_type_register_static (GTK_TYPE_OBJECT, g_intern_static_string ("GtkItemFactory"),
&item_factory_info, 0);
}
(GInstanceInitFunc) gtk_label_init,
};
- label_type = g_type_register_static (GTK_TYPE_MISC, "GtkLabel",
+ label_type = g_type_register_static (GTK_TYPE_MISC, g_intern_static_string ("GtkLabel"),
&label_info, 0);
}
(GInstanceInitFunc) gtk_layout_init,
};
- layout_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkLayout",
+ layout_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkLayout"),
&layout_info, 0);
}
(GtkClassInitFunc) NULL,
};
+ g_intern_static_string ("GtkList");
list_type = gtk_type_unique (GTK_TYPE_CONTAINER, &list_info);
}
(GtkClassInitFunc) NULL,
};
+ g_intern_static_string ("GtkListItem");
list_item_type = gtk_type_unique (gtk_item_get_type (), &list_item_info);
}
NULL
};
- list_store_type = g_type_register_static (G_TYPE_OBJECT, "GtkListStore",
+ list_store_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkListStore"),
&list_store_info, 0);
g_type_add_interface_static (list_store_type,
(GInstanceInitFunc) gtk_menu_init,
};
- menu_type = g_type_register_static (GTK_TYPE_MENU_SHELL, "GtkMenu",
+ menu_type = g_type_register_static (GTK_TYPE_MENU_SHELL, g_intern_static_string ("GtkMenu"),
&menu_info, 0);
}
NULL, /* instance_init */
};
- menu_bar_type = g_type_register_static (GTK_TYPE_MENU_SHELL, "GtkMenuBar",
+ menu_bar_type = g_type_register_static (GTK_TYPE_MENU_SHELL, g_intern_static_string ("GtkMenuBar"),
&menu_bar_info, 0);
}
(GInstanceInitFunc) gtk_menu_item_init,
};
- menu_item_type = g_type_register_static (GTK_TYPE_ITEM, "GtkMenuItem",
+ menu_item_type = g_type_register_static (GTK_TYPE_ITEM, g_intern_static_string ("GtkMenuItem"),
&menu_item_info, 0);
}
};
menu_shell_type =
- g_type_register_static (GTK_TYPE_CONTAINER, "GtkMenuShell",
+ g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkMenuShell"),
&menu_shell_info, G_TYPE_FLAG_ABSTRACT);
}
};
type = g_type_register_static (GTK_TYPE_TOOL_BUTTON,
- "GtkMenuToolButton",
+ g_intern_static_string ("GtkMenuToolButton"),
&info, 0);
}
(GInstanceInitFunc) gtk_message_dialog_init,
};
- dialog_type = g_type_register_static (GTK_TYPE_DIALOG, "GtkMessageDialog",
+ dialog_type = g_type_register_static (GTK_TYPE_DIALOG, g_intern_static_string ("GtkMessageDialog"),
&dialog_info, 0);
}
NULL, /* value_table */
};
- misc_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkMisc",
+ misc_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkMisc"),
&misc_info, G_TYPE_FLAG_ABSTRACT);
}
(GInstanceInitFunc) gtk_notebook_init,
};
- notebook_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkNotebook",
+ notebook_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkNotebook"),
¬ebook_info, 0);
}
NULL, /* value_table */
};
- object_type = g_type_register_static (G_TYPE_OBJECT, "GtkObject",
+ object_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkObject"),
&object_info, G_TYPE_FLAG_ABSTRACT);
}
NULL /* interface_data */
};
- old_editable_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkOldEditable",
+ old_editable_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkOldEditable"),
&old_editable_info, G_TYPE_FLAG_ABSTRACT);
g_type_add_interface_static (old_editable_type,
GTK_TYPE_EDITABLE,
};
option_menu_type =
- g_type_register_static (GTK_TYPE_BUTTON, "GtkOptionMenu",
+ g_type_register_static (GTK_TYPE_BUTTON, g_intern_static_string ("GtkOptionMenu"),
&option_menu_info, 0);
}
NULL, /* value_table */
};
- paned_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkPaned",
+ paned_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkPaned"),
&paned_info, G_TYPE_FLAG_ABSTRACT);
}
*/
#define BUTTON_IS_FAKE_ROOT(button) ((button)->type == HOME_BUTTON)
-G_DEFINE_TYPE (GtkPathBar,
- gtk_path_bar,
- GTK_TYPE_CONTAINER);
+G_DEFINE_TYPE (GtkPathBar, gtk_path_bar, GTK_TYPE_CONTAINER);
static void gtk_path_bar_finalize (GObject *object);
static void gtk_path_bar_dispose (GObject *object);
(GtkClassInitFunc) NULL,
};
+ g_intern_static_string ("GtkPixmap");
pixmap_type = gtk_type_unique (GTK_TYPE_MISC, &pixmap_info);
}
(GInstanceInitFunc) gtk_plug_init,
};
- plug_type = g_type_register_static (GTK_TYPE_WINDOW, "GtkPlug",
+ plug_type = g_type_register_static (GTK_TYPE_WINDOW, g_intern_static_string ("GtkPlug"),
&plug_info, 0);
}
(GtkClassInitFunc) NULL,
};
+ g_intern_static_string ("GtkPreview");
preview_type = gtk_type_unique (GTK_TYPE_WIDGET, &preview_info);
}
(GInstanceInitFunc) gtk_progress_init,
};
- progress_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkProgress",
+ progress_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkProgress"),
&progress_info, 0);
}
};
progress_bar_type =
- g_type_register_static (GTK_TYPE_PROGRESS, "GtkProgressBar",
+ g_type_register_static (GTK_TYPE_PROGRESS, g_intern_static_string ("GtkProgressBar"),
&progress_bar_info, 0);
}
};
type = g_type_register_static (GTK_TYPE_TOGGLE_ACTION,
- "GtkRadioAction",
+ g_intern_static_string ("GtkRadioAction"),
&type_info, 0);
}
return type;
};
radio_button_type =
- g_type_register_static (GTK_TYPE_CHECK_BUTTON, "GtkRadioButton",
+ g_type_register_static (GTK_TYPE_CHECK_BUTTON, g_intern_static_string ("GtkRadioButton"),
&radio_button_info, 0);
}
};
radio_menu_item_type =
- g_type_register_static (GTK_TYPE_CHECK_MENU_ITEM, "GtkRadioMenuItem",
+ g_type_register_static (GTK_TYPE_CHECK_MENU_ITEM, g_intern_static_string ("GtkRadioMenuItem"),
&radio_menu_item_info, 0);
}
};
type = g_type_register_static (GTK_TYPE_TOGGLE_TOOL_BUTTON,
- "GtkRadioToolButton", &type_info, 0);
+ g_intern_static_string ("GtkRadioToolButton"), &type_info, 0);
}
return type;
}
NULL, /* value_table */
};
- range_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkRange",
+ range_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkRange"),
&range_info, G_TYPE_FLAG_ABSTRACT);
}
(GInstanceInitFunc) gtk_rc_style_init,
};
- rc_style_type = g_type_register_static (G_TYPE_OBJECT, "GtkRcStyle",
+ rc_style_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkRcStyle"),
&rc_style_info, 0);
}
(GInstanceInitFunc) gtk_ruler_init,
};
- ruler_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkRuler",
+ ruler_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkRuler"),
&ruler_info, 0);
}
NULL, /* value_table */
};
- scale_type = g_type_register_static (GTK_TYPE_RANGE, "GtkScale",
+ scale_type = g_type_register_static (GTK_TYPE_RANGE, g_intern_static_string ("GtkScale"),
&scale_info, G_TYPE_FLAG_ABSTRACT);
}
};
scrollbar_type =
- g_type_register_static (GTK_TYPE_RANGE, "GtkScrollbar",
+ g_type_register_static (GTK_TYPE_RANGE, g_intern_static_string ("GtkScrollbar"),
&scrollbar_info, G_TYPE_FLAG_ABSTRACT);
}
};
scrolled_window_type =
- g_type_register_static (GTK_TYPE_BIN, "GtkScrolledWindow",
+ g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkScrolledWindow"),
&scrolled_window_info, 0);
}
static GType our_type = 0;
if (our_type == 0)
- our_type = g_boxed_type_register_static ("GtkSelectionData",
+ our_type = g_boxed_type_register_static (g_intern_static_string ("GtkSelectionData"),
(GBoxedCopyFunc) gtk_selection_data_copy,
(GBoxedFreeFunc) gtk_selection_data_free);
};
separator_type =
- g_type_register_static (GTK_TYPE_WIDGET, "GtkSeparator",
+ g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkSeparator"),
&separator_info, G_TYPE_FLAG_ABSTRACT);
}
};
type = g_type_register_static (GTK_TYPE_TOOL_ITEM,
- "GtkSeparatorToolItem", &type_info, 0);
+ g_intern_static_string ("GtkSeparatorToolItem"), &type_info, 0);
}
return type;
}
(GInstanceInitFunc) gtk_settings_init,
};
- settings_type = g_type_register_static (G_TYPE_OBJECT, "GtkSettings",
+ settings_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkSettings"),
&settings_info, 0);
}
(GInstanceInitFunc) gtk_size_group_init,
};
- size_group_type = g_type_register_static (G_TYPE_OBJECT, "GtkSizeGroup",
+ size_group_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkSizeGroup"),
&size_group_info, 0);
}
(GInstanceInitFunc) gtk_socket_init,
};
- socket_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkSocket",
+ socket_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkSocket"),
&socket_info, 0);
}
};
spin_button_type =
- g_type_register_static (GTK_TYPE_ENTRY, "GtkSpinButton",
+ g_type_register_static (GTK_TYPE_ENTRY, g_intern_static_string ("GtkSpinButton"),
&spin_button_info, 0);
g_type_add_interface_static (spin_button_type,
(GInstanceInitFunc) gtk_statusbar_init,
};
- statusbar_type = g_type_register_static (GTK_TYPE_HBOX, "GtkStatusbar",
+ statusbar_type = g_type_register_static (GTK_TYPE_HBOX, g_intern_static_string ("GtkStatusbar"),
&statusbar_info, 0);
}
(GInstanceInitFunc) gtk_style_init,
};
- style_type = g_type_register_static (G_TYPE_OBJECT, "GtkStyle",
+ style_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkStyle"),
&style_info, 0);
}
static GType our_type = 0;
if (our_type == 0)
- our_type = g_boxed_type_register_static ("GtkBorder",
+ our_type = g_boxed_type_register_static (g_intern_static_string ("GtkBorder"),
(GBoxedCopyFunc) gtk_border_copy,
(GBoxedFreeFunc) gtk_border_free);
(GInstanceInitFunc) gtk_table_init,
};
- table_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkTable",
+ table_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkTable"),
&table_info, 0);
}
};
tearoff_menu_item_type =
- g_type_register_static (GTK_TYPE_MENU_ITEM, "GtkTearoffMenuItem",
+ g_type_register_static (GTK_TYPE_MENU_ITEM, g_intern_static_string ("GtkTearoffMenuItem"),
&tearoff_menu_item_info, 0);
}
NULL /* interface_data */
};
+ g_intern_static_string ("GtkText");
text_type = gtk_type_unique (GTK_TYPE_OLD_EDITABLE, &text_info);
g_type_add_interface_static (text_type,
GTK_TYPE_EDITABLE,
(GInstanceInitFunc) gtk_text_buffer_init
};
- our_type = g_type_register_static (G_TYPE_OBJECT, "GtkTextBuffer",
+ our_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTextBuffer"),
&our_info, 0);
}
(GInstanceInitFunc) gtk_text_child_anchor_init,
};
- object_type = g_type_register_static (G_TYPE_OBJECT, "GtkTextChildAnchor",
+ object_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTextChildAnchor"),
&object_info, 0);
}
(GInstanceInitFunc) gtk_text_layout_init
};
- our_type = g_type_register_static (G_TYPE_OBJECT, "GtkTextLayout",
+ our_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTextLayout"),
&our_info, 0);
}
(GInstanceInitFunc) gtk_text_mark_init,
};
- object_type = g_type_register_static (G_TYPE_OBJECT, "GtkTextMark",
+ object_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTextMark"),
&object_info, 0);
}
(GInstanceInitFunc) gtk_text_tag_init
};
- our_type = g_type_register_static (G_TYPE_OBJECT, "GtkTextTag",
+ our_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTextTag"),
&our_info, 0);
}
static GType our_type = 0;
if (our_type == 0)
- our_type = g_boxed_type_register_static ("GtkTextAttributes",
+ our_type = g_boxed_type_register_static (g_intern_static_string ("GtkTextAttributes"),
(GBoxedCopyFunc) gtk_text_attributes_ref,
(GBoxedFreeFunc) gtk_text_attributes_unref);
(GInstanceInitFunc) gtk_text_tag_table_init
};
- our_type = g_type_register_static (G_TYPE_OBJECT, "GtkTextTagTable",
+ our_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTextTagTable"),
&our_info, 0);
}
(GInstanceInitFunc) gtk_text_view_init,
};
- our_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkTextView",
+ our_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkTextView"),
&our_info, 0);
}
};
theme_engine_type =
- g_type_register_static (G_TYPE_TYPE_MODULE, "GtkThemeEngine",
+ g_type_register_static (G_TYPE_TYPE_MODULE, g_intern_static_string ("GtkThemeEngine"),
&theme_engine_info, 0);
}
(GtkClassInitFunc) NULL,
};
+ g_intern_static_string ("GtkTipsQuery");
tips_query_type = gtk_type_unique (gtk_label_get_type (), &tips_query_info);
}
};
type = g_type_register_static (GTK_TYPE_ACTION,
- "GtkToggleAction",
+ g_intern_static_string ("GtkToggleAction"),
&type_info, 0);
}
return type;
};
toggle_button_type =
- g_type_register_static (GTK_TYPE_BUTTON, "GtkToggleButton",
+ g_type_register_static (GTK_TYPE_BUTTON, g_intern_static_string ("GtkToggleButton"),
&toggle_button_info, 0);
}
};
type = g_type_register_static (GTK_TYPE_TOOL_BUTTON,
- "GtkToggleToolButton", &type_info, 0);
+ g_intern_static_string ("GtkToggleToolButton"), &type_info, 0);
}
return type;
}
};
type = g_type_register_static (GTK_TYPE_CONTAINER,
- "GtkToolbar",
+ g_intern_static_string ("GtkToolbar"),
&type_info, 0);
}
};
type = g_type_register_static (GTK_TYPE_TOOL_ITEM,
- "GtkToolButton",
+ g_intern_static_string ("GtkToolButton"),
&type_info, 0);
}
return type;
};
type = g_type_register_static (GTK_TYPE_BIN,
- "GtkToolItem",
+ g_intern_static_string ("GtkToolItem"),
&type_info, 0);
}
return type;
(GInstanceInitFunc) gtk_tooltips_init,
};
- tooltips_type = g_type_register_static (GTK_TYPE_OBJECT, "GtkTooltips",
+ tooltips_type = g_type_register_static (GTK_TYPE_OBJECT, g_intern_static_string ("GtkTooltips"),
&tooltips_info, 0);
}
(GtkClassInitFunc) NULL,
};
+ g_intern_static_string ("GtkTree");
tree_type = gtk_type_unique (gtk_container_get_type (), &tree_info);
}
NULL
};
- our_type = g_type_register_static (G_TYPE_INTERFACE, "GtkTreeDragSource",
+ our_type = g_type_register_static (G_TYPE_INTERFACE, g_intern_static_string ("GtkTreeDragSource"),
&our_info, 0);
}
NULL
};
- our_type = g_type_register_static (G_TYPE_INTERFACE, "GtkTreeDragDest", &our_info, 0);
+ our_type = g_type_register_static (G_TYPE_INTERFACE, g_intern_static_string ("GtkTreeDragDest"), &our_info, 0);
}
return our_type;
(GtkClassInitFunc) NULL,
};
+ g_intern_static_string ("GtkTreeItem");
tree_item_type = gtk_type_unique (gtk_item_get_type (), &tree_item_info);
}
};
tree_model_type =
- g_type_register_static (G_TYPE_INTERFACE, "GtkTreeModel",
+ g_type_register_static (G_TYPE_INTERFACE, g_intern_static_string ("GtkTreeModel"),
&tree_model_info, 0);
g_type_interface_add_prerequisite (tree_model_type, G_TYPE_OBJECT);
static GType our_type = 0;
if (our_type == 0)
- our_type = g_boxed_type_register_static ("GtkTreePath",
+ our_type = g_boxed_type_register_static (g_intern_static_string ("GtkTreePath"),
(GBoxedCopyFunc) gtk_tree_path_copy,
(GBoxedFreeFunc) gtk_tree_path_free);
static GType our_type = 0;
if (our_type == 0)
- our_type = g_boxed_type_register_static ("GtkTreeIter",
+ our_type = g_boxed_type_register_static (g_intern_static_string ("GtkTreeIter"),
(GBoxedCopyFunc) gtk_tree_iter_copy,
(GBoxedFreeFunc) gtk_tree_iter_free);
static GType our_type = 0;
if (our_type == 0)
- our_type = g_boxed_type_register_static ("GtkTreeRowReference",
+ our_type = g_boxed_type_register_static (g_intern_static_string ("GtkTreeRowReference"),
(GBoxedCopyFunc) gtk_tree_row_reference_copy,
(GBoxedFreeFunc) gtk_tree_row_reference_free);
};
tree_model_filter_type = g_type_register_static (G_TYPE_OBJECT,
- "GtkTreeModelFilter",
+ g_intern_static_string ("GtkTreeModelFilter"),
&tree_model_filter_info, 0);
g_type_add_interface_static (tree_model_filter_type,
};
tree_model_sort_type =
- g_type_register_static (G_TYPE_OBJECT, "GtkTreeModelSort",
+ g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTreeModelSort"),
&tree_model_sort_info, 0);
g_type_add_interface_static (tree_model_sort_type,
};
selection_type =
- g_type_register_static (G_TYPE_OBJECT, "GtkTreeSelection",
+ g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTreeSelection"),
&selection_info, 0);
}
};
tree_sortable_type =
- g_type_register_static (G_TYPE_INTERFACE, "GtkTreeSortable",
+ g_type_register_static (G_TYPE_INTERFACE, g_intern_static_string ("GtkTreeSortable"),
&tree_sortable_info, 0);
g_type_interface_add_prerequisite (tree_sortable_type, GTK_TYPE_TREE_MODEL);
NULL
};
- tree_store_type = g_type_register_static (G_TYPE_OBJECT, "GtkTreeStore",
+ tree_store_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTreeStore"),
&tree_store_info, 0);
g_type_add_interface_static (tree_store_type,
};
tree_view_type =
- g_type_register_static (GTK_TYPE_CONTAINER, "GtkTreeView",
+ g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkTreeView"),
&tree_view_info, 0);
}
};
tree_column_type =
- g_type_register_static (GTK_TYPE_OBJECT, "GtkTreeViewColumn",
+ g_type_register_static (GTK_TYPE_OBJECT, g_intern_static_string ("GtkTreeViewColumn"),
&tree_column_info, 0);
g_type_add_interface_static (tree_column_type,
};
type = g_type_register_static (G_TYPE_OBJECT,
- "GtkUIManager",
+ g_intern_static_string ("GtkUIManager"),
&type_info, 0);
}
return type;
};
vbutton_box_type =
- g_type_register_static (GTK_TYPE_BUTTON_BOX, "GtkVButtonBox",
+ g_type_register_static (GTK_TYPE_BUTTON_BOX, g_intern_static_string ("GtkVButtonBox"),
&vbutton_box_info, 0);
}
(GInstanceInitFunc) gtk_vbox_init,
};
- vbox_type = g_type_register_static (GTK_TYPE_BOX, "GtkVBox",
+ vbox_type = g_type_register_static (GTK_TYPE_BOX, g_intern_static_string ("GtkVBox"),
&vbox_info, 0);
}
(GInstanceInitFunc) gtk_viewport_init,
};
- viewport_type = g_type_register_static (GTK_TYPE_BIN, "GtkViewport",
+ viewport_type = g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkViewport"),
&viewport_info, 0);
}
(GInstanceInitFunc) gtk_vpaned_init,
};
- vpaned_type = g_type_register_static (GTK_TYPE_PANED, "GtkVPaned",
+ vpaned_type = g_type_register_static (GTK_TYPE_PANED, g_intern_static_string ("GtkVPaned"),
&vpaned_info, 0);
}
(GInstanceInitFunc) gtk_vruler_init,
};
- vruler_type = g_type_register_static (GTK_TYPE_RULER, "GtkVRuler",
+ vruler_type = g_type_register_static (GTK_TYPE_RULER, g_intern_static_string ("GtkVRuler"),
&vruler_info, 0);
}
(GInstanceInitFunc) gtk_vscale_init,
};
- vscale_type = g_type_register_static (GTK_TYPE_SCALE, "GtkVScale",
+ vscale_type = g_type_register_static (GTK_TYPE_SCALE, g_intern_static_string ("GtkVScale"),
&vscale_info, 0);
}
};
vscrollbar_type =
- g_type_register_static (GTK_TYPE_SCROLLBAR, "GtkVScrollbar",
+ g_type_register_static (GTK_TYPE_SCROLLBAR, g_intern_static_string ("GtkVScrollbar"),
&vscrollbar_info, 0);
}
};
vseparator_type =
- g_type_register_static (GTK_TYPE_SEPARATOR, "GtkVSeparator",
+ g_type_register_static (GTK_TYPE_SEPARATOR, g_intern_static_string ("GtkVSeparator"),
&vseparator_info, 0);
}
NULL /* interface data */
};
- widget_type = g_type_register_static (GTK_TYPE_OBJECT, "GtkWidget",
+ widget_type = g_type_register_static (GTK_TYPE_OBJECT, g_intern_static_string ("GtkWidget"),
&widget_info, G_TYPE_FLAG_ABSTRACT);
g_type_add_interface_static (widget_type, ATK_TYPE_IMPLEMENTOR,
static GType our_type = 0;
if (our_type == 0)
- our_type = g_boxed_type_register_static ("GtkRequisition",
+ our_type = g_boxed_type_register_static (g_intern_static_string ("GtkRequisition"),
(GBoxedCopyFunc) gtk_requisition_copy,
(GBoxedFreeFunc) gtk_requisition_free);
(GInstanceInitFunc) gtk_window_init,
};
- window_type = g_type_register_static (GTK_TYPE_BIN, "GtkWindow",
+ window_type = g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkWindow"),
&window_info, 0);
}
(GInstanceInitFunc) NULL,
};
- window_group_type = g_type_register_static (G_TYPE_OBJECT, "GtkWindowGroup", &window_group_info, 0);
+ window_group_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkWindowGroup"),
+ &window_group_info, 0);
}
return window_group_type;